diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:38:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 15:38:34 +0200 |
| commit | d195e6e410e4d8220a7751765c71ec111f89597f (patch) | |
| tree | 7b172c909e16bcce62abe3057bbe9d2aa4859963 /libavcodec/h264_sei.c | |
| parent | af2bb83dffb7a2be00a155aeba24a3312c1fb94e (diff) | |
| parent | 71cabb521ac397db3903011d2de7afd3e0fc7ab6 (diff) | |
Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'
* commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6':
h264: do not discard NAL_SEI when skipping frames
Conflicts:
libavcodec/h264.c
See: 7d75fb381ba774a8d2fa7de0c12140cd465c0255
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_sei.c')
0 files changed, 0 insertions, 0 deletions