aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_mpeg4.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-30 22:44:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-30 22:44:18 +0200
commit64b25938e90253432d28ffd7d971f085c560a523 (patch)
tree56ba6a39d7e8f14ebccdcc4db935164b5da624a2 /libavformat/rtpdec_mpeg4.c
parentbe24f85176d8e46c3154f1f51013f235b273183e (diff)
parentceabc13f129cd6344b1eebdbe10119083fe5520e (diff)
downloadffmpeg-64b25938e90253432d28ffd7d971f085c560a523.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section. dnxhdenc: add space between function argument type and comment. x86: fmtconvert: add special asm for float_to_int16_interleave_misc_* attributes: Add a definition of av_always_inline for MSVC cmdutils: Pass the actual chosen encoder to filter_codec_opts os_support: Add fallback definitions for stat flags os_support: Rename the poll fallback function to ff_poll network: Check for struct pollfd os_support: Don't compare a negative number against socket descriptors os_support: Include all the necessary headers for the win32 open function x86: vc1: fix and enable optimised loop filter Conflicts: cmdutils.c cmdutils.h ffmpeg.c ffplay.c libavformat/os_support.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
0 files changed, 0 insertions, 0 deletions