diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:28:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:28:24 +0200 |
| commit | 11dfd2a74a331f47135d3e0bcd5d503750e66004 (patch) | |
| tree | cc5af502ff34eb720eeeda4c7ddf82bf0f20169a /libavutil/parseutils.h | |
| parent | f6c1fdba22dc9f1e8a676949e9d404907ceda10c (diff) | |
| parent | 7fd6c9fb49573870b48a995947edc83eedd7e86e (diff) | |
| download | ffmpeg-11dfd2a74a331f47135d3e0bcd5d503750e66004.tar.gz | |
Merge commit '7fd6c9fb49573870b48a995947edc83eedd7e86e' into release/1.1
* commit '7fd6c9fb49573870b48a995947edc83eedd7e86e':
h264: reset first_field if frame_start() fails for missing refs
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.h')
0 files changed, 0 insertions, 0 deletions