aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bmp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-03 01:47:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-03 01:47:16 +0200
commit0558832796b0be1fb8817ba8b7cbfa9d5cf765ee (patch)
treeb7e8576dd3576ebb1668094a35cb925270e856f9 /libavcodec/bmp.c
parentced5c8e6b36fa219cf7ea7d934da2105ae99a887 (diff)
parenta7cce9ebf3ae3b9678970236c964900393603a73 (diff)
downloadffmpeg-0558832796b0be1fb8817ba8b7cbfa9d5cf765ee.tar.gz
Merge commit 'a7cce9ebf3ae3b9678970236c964900393603a73' into release/0.10
* commit 'a7cce9ebf3ae3b9678970236c964900393603a73': h264: reset first_field if frame_start() fails for missing refs Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp.c')
0 files changed, 0 insertions, 0 deletions