diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:34:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:34:28 +0200 |
| commit | d123d9abef52931f54701e5fb0ed569416258f75 (patch) | |
| tree | 75d6632334cb59ba0b057f03dc170877edc6872f /libavcodec | |
| parent | c24be3c4a2e15e7295bdef8183deb168b6835eb9 (diff) | |
| parent | 8dca0877e3e1457e9ec79ffa1ead1135aabb791c (diff) | |
| download | ffmpeg-d123d9abef52931f54701e5fb0ed569416258f75.tar.gz | |
Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'
* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
mpegts: Return proper error code on invalid input data
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions