diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:14:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:14:54 +0200 |
| commit | c2df95978b19d0d4b625c23a05f4bf78e8397d0b (patch) | |
| tree | 43fdb793543f9350bf1c7e2f2da23ab35576deed /libavcodec/mpeg4video.c | |
| parent | 6565b1ad97fe166891dd0bb6652b78216dc2d039 (diff) | |
| parent | be0b4c70ec40d7f9ac8e416a4379d4a387421184 (diff) | |
| download | ffmpeg-c2df95978b19d0d4b625c23a05f4bf78e8397d0b.tar.gz | |
Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'
* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
atrac3: Replace a silly counter variable name with plain 'j'
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.c')
0 files changed, 0 insertions, 0 deletions