diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 00:54:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 01:03:07 +0200 |
| commit | a7758884db7eb3041b73d673c1ac3897609556b9 (patch) | |
| tree | fbf882650e3d0607bd189ae571e402b55179f078 /libavformat/utils.c | |
| parent | f7e797aa5c987c39b55666a2d41877ef2aec40bc (diff) | |
| parent | 0c378ea1f76e226eff460c84634e7227e3705372 (diff) | |
| download | ffmpeg-a7758884db7eb3041b73d673c1ac3897609556b9.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 4dcf0ac2df..72990f6230 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -887,6 +887,7 @@ static int is_intra_only(AVCodecContext *enc){ case CODEC_ID_MJPEG: case CODEC_ID_MJPEGB: case CODEC_ID_LJPEG: + case CODEC_ID_PRORES: case CODEC_ID_RAWVIDEO: case CODEC_ID_DVVIDEO: case CODEC_ID_HUFFYUV: @@ -896,7 +897,6 @@ static int is_intra_only(AVCodecContext *enc){ case CODEC_ID_VCR1: case CODEC_ID_DNXHD: case CODEC_ID_JPEG2000: - case CODEC_ID_PRORES: return 1; default: break; } |