diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 14:48:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 15:30:12 +0200 |
| commit | e744e9a305896d8cbe3c06951b0a7e535ccd8562 (patch) | |
| tree | c9bc041c4b247e923f14baa243d8d050e442f101 /libavcodec/mpeg4video_parser.c | |
| parent | 6ef5e292200b6824b666a6a876d344fe7e6a48b2 (diff) | |
| parent | ef363ebd596da18f889a7d4845023a23dfac84c9 (diff) | |
| download | ffmpeg-e744e9a305896d8cbe3c06951b0a7e535ccd8562.tar.gz | |
Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'
* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
mp3enc: write full LAME frame
Conflicts:
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
0 files changed, 0 insertions, 0 deletions