diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-19 15:07:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-19 15:07:12 +0200 |
| commit | ada49f936eaafe12365c7b962355d6dcfbfc4029 (patch) | |
| tree | 156ef379f06014ba97a73c7002b61b76c0a073a1 /libavformat/mpegts.h | |
| parent | ba57ef29723e11e94f2d5a07d4f384e636316c16 (diff) | |
| parent | 87cf70eb237e7586cc7399627dafa1b980ec0b7d (diff) | |
| download | ffmpeg-ada49f936eaafe12365c7b962355d6dcfbfc4029.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: correct implicit weight table computation for long ref pics
h264: correct the check for invalid long term frame index in MMCO decode
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.h')
0 files changed, 0 insertions, 0 deletions