diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:17:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:17:16 +0100 |
| commit | 4adc8a29a0565cb35815eeb8e693b47dcaf890ce (patch) | |
| tree | 69f03cedcda1457ba0c5303c2dc70437aa38f0c0 /libavcodec/vaapi_h264.c | |
| parent | 8943925d1f68316218a9722c3f275ae1ae29b325 (diff) | |
| parent | 74a9a624c5c4d50760d8d57458eba57366f6cb26 (diff) | |
| download | ffmpeg-streaming-4adc8a29a0565cb35815eeb8e693b47dcaf890ce.zip ffmpeg-streaming-4adc8a29a0565cb35815eeb8e693b47dcaf890ce.tar.gz | |
Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'
* commit '74a9a624c5c4d50760d8d57458eba57366f6cb26':
vcr1: return a meaningful error code.
rpza: return a meaningful error code.
qdrw: cosmetics, reformat
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_h264.c')
0 files changed, 0 insertions, 0 deletions
