diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 21:41:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 21:43:25 +0100 |
| commit | 265c4771cc764372104ba8f6abfdde9239f4c0ad (patch) | |
| tree | 19dddc4c7e16a5a314700c295a0793722679df2c /libavcodec/rv34_parser.c | |
| parent | 9a534eda4608b76fa0c958e876025b2c639aeb63 (diff) | |
| parent | 043ea6f7bfc59399b6b3659da785ec4cc68a008e (diff) | |
| download | ffmpeg-265c4771cc764372104ba8f6abfdde9239f4c0ad.tar.gz | |
Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
fbdev: Use av_strerror
Conflicts:
libavdevice/fbdev_dec.c
See: f6b56b1f26a1e40a47d85d24b42cd5475cd3b04f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34_parser.c')
0 files changed, 0 insertions, 0 deletions