diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 13:35:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 13:35:45 +0100 |
| commit | 60b46a00c62db3e366322f99d261480cd213bfa5 (patch) | |
| tree | a3e8cb0ad9d920b6162332fd07cd5356191de38a /libavfilter/bbox.c | |
| parent | 5cbd7ce016adec2beafe49be931ff445f3decdaf (diff) | |
| parent | 73e8fab31dc19c4371499e612856accbc00b2820 (diff) | |
| download | ffmpeg-60b46a00c62db3e366322f99d261480cd213bfa5.tar.gz | |
Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'
* commit '73e8fab31dc19c4371499e612856accbc00b2820':
h264: print values in case of error
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/bbox.c')
0 files changed, 0 insertions, 0 deletions