diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 13:23:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 13:23:35 +0100 |
| commit | ff3b59c848b62ca926be676fe8f31765fe34d66f (patch) | |
| tree | dd2fd23ee47d7ae1e90d285cccabfb39effae53c /libavformat/mp3enc.c | |
| parent | f30cf51d46348a43175041df014049d1fa51ed36 (diff) | |
| parent | 8c3849bc76c124d5803f9db52c7c88a79226323d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: port to cpuflags
crc: av_crc() parameter names should match between .c, .h and doxygen
avserver: replace av_read_packet with av_read_frame
avserver: fix constness casting warnings
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mp3enc.c')
0 files changed, 0 insertions, 0 deletions