diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 12:10:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 12:10:38 +0200 |
| commit | ac20ba35e37dac843c9692a02a63e6a6e3bcce36 (patch) | |
| tree | 94637e759d3202b0092f968fc0df8d333cf2e732 /libavformat/mux.c | |
| parent | 198e10b55cc908d9194d34013d212e4b5ff3b42f (diff) | |
| parent | 031be5b41b54c3b666f31d83fe3ad41c194af8c5 (diff) | |
| download | ffmpeg-ac20ba35e37dac843c9692a02a63e6a6e3bcce36.tar.gz | |
Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
* commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5':
ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions