[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sat Sep 24 01:28:21 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 24 00:54:59 2011 +0200| [a7758884db7eb3041b73d673c1ac3897609556b9] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtp: factorize dynamic payload type fallback
flvdec: Ignore the index if it's from a creator known to be different
cmdutils: move grow_array out of #if CONFIG_AVFILTER
avconv: actually set InputFile.rate_emu
ratecontrol: update last_qscale_for sooner
Fix unnecessary shift with 9/10bit vertical scaling
prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
prores: return more meaningful error values
prores: improve error message wording
prores: cosmetics: prettyprinting, drop useless parentheses
prores: lowercase AVCodec name entry
Conflicts:
cmdutils.c
libavcodec/proresdec_lgpl.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7758884db7eb3041b73d673c1ac3897609556b9
---
More information about the ffmpeg-cvslog
mailing list