diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:19 +0200 |
| commit | 563fe360c356c0144badd63063c16dae989b5379 (patch) | |
| tree | 38b250fdf76bf31fa5e3c7c91fc9a0456f57f98d /libavcodec/utils.c | |
| parent | 73a502dd436425875fae1305d47cf0c1fbf24d68 (diff) | |
| parent | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (diff) | |
| download | ffmpeg-563fe360c356c0144badd63063c16dae989b5379.tar.gz | |
Merge commit 'd7e5aeb' into oldabi
* commit 'd7e5aeb': (24 commits)
Fix runtime CPU detection in libswscale.
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
...
Conflicts:
libavcodec/version.h
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 6eb3d3061f..582d88cec4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1146,18 +1146,11 @@ void avcodec_default_free_buffers(AVCodecContext *s){ s->internal_buffer_count=0; } +#if FF_API_OLD_FF_PICT_TYPES char av_get_pict_type_char(int pict_type){ - switch(pict_type){ - case FF_I_TYPE: return 'I'; - case FF_P_TYPE: return 'P'; - case FF_B_TYPE: return 'B'; - case FF_S_TYPE: return 'S'; - case FF_SI_TYPE:return 'i'; - case FF_SP_TYPE:return 'p'; - case FF_BI_TYPE:return 'b'; - default: return '?'; - } + return av_get_picture_type_char(pict_type); } +#endif int av_get_bits_per_sample(enum CodecID codec_id){ switch(codec_id){ |