diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 22:19:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 22:21:56 +0100 |
| commit | 9d921cce4f5501e4c507cc921f76a283bee39d09 (patch) | |
| tree | 72ed53954ff80a4ee65891b745916991ce6271eb /libavformat/rtpenc_jpeg.c | |
| parent | bcc43de51f37013621934991086a5d6dcb94f493 (diff) | |
| parent | 3a56bcee7cb7549b2813e39ce3bee3b7c522aecb (diff) | |
| download | ffmpeg-9d921cce4f5501e4c507cc921f76a283bee39d09.tar.gz | |
Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'
* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
mpeg12dec: Use more specific error codes
Conflicts:
libavcodec/mpeg12dec.c
See: 1852b2a0f497d3c5437d5b50379d7874fc8c285a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
0 files changed, 0 insertions, 0 deletions