diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 19:46:06 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 19:50:06 -0700 |
| commit | de625312862a99500ce7aa1703b5d783ae66d704 (patch) | |
| tree | 0590e6448b83540302ca747e80d3ee7309a088c4 /cmdutils.h | |
| parent | e0c8250a59adbf7135adb870be275df05a61e052 (diff) | |
| parent | e26c64148be8a20ace7512d96503172fb5e9753b (diff) | |
| download | ffmpeg-streaming-de625312862a99500ce7aa1703b5d783ae66d704.zip ffmpeg-streaming-de625312862a99500ce7aa1703b5d783ae66d704.tar.gz | |
Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'
* commit 'e26c64148be8a20ace7512d96503172fb5e9753b':
h264: discard slices of redundant pictures right after parsing the slice header
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
TODO: fix indentation
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'cmdutils.h')
0 files changed, 0 insertions, 0 deletions
