diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-04 15:51:14 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-04 15:51:14 -0300 |
| commit | 7c5adf6c88dd89e716dec33d97ef63530a9ce05f (patch) | |
| tree | 394fc2e009692d6a11bb0ba062a4750fffca8bd3 /libavcodec/escape124.c | |
| parent | 52febc687b23855c00103f91ded7aa888a066f16 (diff) | |
| parent | 2dbe2aa2c2d4f02d2669feae45dee4fc45414813 (diff) | |
| download | ffmpeg-7c5adf6c88dd89e716dec33d97ef63530a9ce05f.tar.gz | |
Merge commit '2dbe2aa2c2d4f02d2669feae45dee4fc45414813'
* commit '2dbe2aa2c2d4f02d2669feae45dee4fc45414813':
rdt: Convert to the new bitstream reader
ogg: Convert to the new bitstream reader
mpegts: Convert to the new bitstream reader
xsubdec: Convert to the new bitstream reader
xan: Convert to the new bitstream reader
wnv1: Convert to the new bitstream reader
vima: Convert to the new bitstream reader
vble: Convert to the new bitstream reader
utvideodec: Convert to the new bitstream reader
twinvq: Convert to the new bitstream reader
tscc2: Convert to the new bitstream reader
truespeech: Convert to the new bitstream reader
tiertex: Convert to the new bitstream reader
truemotion2: Convert to the new bitstream reader
svq1dec: Convert to the new bitstream reader
smacker: Convert to the new bitstream reader
sipr: Convert to the new bitstream reader
rtjpeg: Convert to the new bitstream reader
ra288: Convert to the new bitstream reader
ra144: Convert to the new bitstream reader
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/escape124.c')
0 files changed, 0 insertions, 0 deletions