diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 00:27:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 00:31:58 +0200 |
| commit | ea7e4f8e6aa2500716b55a1d9ad247bca1cd1174 (patch) | |
| tree | a379a952a8f70763c5b339167aef685e0eb4535f | |
| parent | e1296b5fa4e54941dcc68136022d71dfff01e214 (diff) | |
| parent | b7040e67ec18259ca634a0e29d98469b3484a87c (diff) | |
| download | ffmpeg-streaming-ea7e4f8e6aa2500716b55a1d9ad247bca1cd1174.zip ffmpeg-streaming-ea7e4f8e6aa2500716b55a1d9ad247bca1cd1174.tar.gz | |
Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'
* commit 'b7040e67ec18259ca634a0e29d98469b3484a87c':
h264: fix AVDISCARD_NONKEY for some interlaced content
Conflicts:
libavcodec/h264.c
Not merged, the used field is not initialized where it is used
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
0 files changed, 0 insertions, 0 deletions
