diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 10:08:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 10:08:48 +0200 |
| commit | e0b45ca730f2b805d1d111067e1a99bff4516549 (patch) | |
| tree | ba8e1247df52dd8b5b0138aa739acf9a2c99fc50 /libavformat | |
| parent | 4dcb2f74786e86e93436d5a8c2460c1249f9226b (diff) | |
| parent | b3dc260e7fa6f3f852dd5cb7d86763c4b5736714 (diff) | |
| download | ffmpeg-e0b45ca730f2b805d1d111067e1a99bff4516549.tar.gz | |
Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'
* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
h264: return meaningful values
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions