diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:38:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:38:42 +0200 |
| commit | e8a460672f7e9aec129a7cfa01345857b1565a15 (patch) | |
| tree | e1ac45a7358c1502eadc93d9389267e41044eb08 /libavcodec/s3tc.c | |
| parent | 0d5e615c10583af5f346f0bc7420ebc5077a5d47 (diff) | |
| parent | 9d33bab583a82cf12286c65258a29c6888e1ff98 (diff) | |
| download | ffmpeg-e8a460672f7e9aec129a7cfa01345857b1565a15.tar.gz | |
Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'
* commit '9d33bab583a82cf12286c65258a29c6888e1ff98':
h264: drop H264Context.ouputed_poc
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/s3tc.c')
0 files changed, 0 insertions, 0 deletions