diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 21:55:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 21:55:02 +0100 |
| commit | c2ad22ff9934eb9324ad8be98f0f5790e4947859 (patch) | |
| tree | f736cbca83414ca9b15d2e61f53ec4ed18c1e0dc /libavcodec/mpegaudioenc_template.c | |
| parent | e18e5ae62ce29c51a80441369d6d036d171a8d13 (diff) | |
| parent | 08fa34bf75942f66796d770ff42a3721b2e3d2d4 (diff) | |
| download | ffmpeg-c2ad22ff9934eb9324ad8be98f0f5790e4947859.tar.gz | |
Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'
* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
yuv4mpegdec: initialize field_order in yuv4_read_header()
Conflicts:
libavformat/yuv4mpegdec.c
See: 52a17972defa118705a4020a6d0bb3ad277df819
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc_template.c')
0 files changed, 0 insertions, 0 deletions