summaryrefslogtreecommitdiffstats
path: root/mt-work/mplayer.diff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-21 21:25:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-21 21:25:43 +0200
commit3e1a7ae44a97f20bbc9da0eba000663ef74e1890 (patch)
tree75bfd6ad30f1b24aa7d29c3a3081875c14b5dab5 /mt-work/mplayer.diff
parent358d837dad4e2fbe010553990383d0ca4d5937cf (diff)
parent05fc9e40a4e4f808d457512420b887f458d216bc (diff)
downloadffmpeg-streaming-3e1a7ae44a97f20bbc9da0eba000663ef74e1890.zip
ffmpeg-streaming-3e1a7ae44a97f20bbc9da0eba000663ef74e1890.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: swfdec: Add support for sample_rate_code 0 (5512 Hz) dct-test: factor out some common code and do whas was likely intended doc: library versions need to be bumped in version.h Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." Remove some forgotten AVCodecContext.palctrl usage. lavc/utils: move avcodec_init() higher in the file. lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* ac3dec: actually use drc_scale private option lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros alsa: add missing header msmpeg4: remove leftover unused debug variable declaration Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. Fix av_dlog invocations with wrong or missing logging context. vf_yadif: add support to yuva420p vf_yadif: correct documentation on the parity parameter vf_yadif: copy buffer properties like aspect for second frame as well oma: support for encrypted files id3v2: add support for non-text and GEOB type tag frames des: add possibility to calculate DES-CBC-MAC with small buffer Conflicts: ffmpeg.c libavcodec/dct-test.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'mt-work/mplayer.diff')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud