diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 10:28:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 10:28:49 +0200 |
| commit | d2d8e259fd2e5149546431b6c7d1cd3560b7ab97 (patch) | |
| tree | 0dace1203dc7941216e613d0e4ff13e24a147b71 /libavformat/flv.h | |
| parent | 019eb2c77b7c315580200a5dbe6dabb1c97a3764 (diff) | |
| parent | 5eb488bfa835f2902a31ba99d57c16ae36c4f598 (diff) | |
| download | ffmpeg-d2d8e259fd2e5149546431b6c7d1cd3560b7ab97.tar.gz | |
Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'
* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
h264: use explicit variable names for *_field_flag
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flv.h')
0 files changed, 0 insertions, 0 deletions