diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 20:43:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 20:48:14 +0200 |
| commit | cde98920da78801a40f9120cfef650ac05a22224 (patch) | |
| tree | 928fd16b1392ccc810fcc480dd5d407e6397a47d /doc/devices.texi | |
| parent | 0968180f028a3afdf60e030084753164df0adb5b (diff) | |
| parent | 84f226a3bcd8b39801a4c9051c033ab7d61aaf76 (diff) | |
| download | ffmpeg-cde98920da78801a40f9120cfef650ac05a22224.tar.gz | |
Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'
* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76':
h264: use the correct SPS during PPS parsing
Conflicts:
libavcodec/h264_ps.c
See: dc35b77b28f40c99d27c073fe2c22219ba600202
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/devices.texi')
0 files changed, 0 insertions, 0 deletions