Commit 24d06cb2 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5e753ed5'

* commit '5e753ed5':
  suncc: Replace more GCC flags by their equivalents in suncc_flags()
  libtheoraenc: fix granularity of video quality
  oggparsetheora: fix comment header parsing
  h264: don't clobber mmco opcode tables for non-first slice headers.

Conflicts:
	libavcodec/h264_refs.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 353dbaa2 5e753ed5
......@@ -2509,7 +2509,8 @@ suncc_flags(){
-fomit-frame-pointer) echo -xregs=frameptr ;;
-fPIC) echo -KPIC -xcode=pic32 ;;
-W*,*) echo $flag ;;
-f*-*|-W*) ;;
-f*-*|-W*|-mimpure-text) ;;
-shared) echo -G ;;
*) echo $flag ;;
esac
done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment