diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:29:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:29:31 +0100 |
| commit | 4b7c81c3e059ae08e4aa74222de1762342ef8abf (patch) | |
| tree | 86f804f2006b9c32d01d291bb2a20ff3fe56d542 /libavcodec/r210dec.c | |
| parent | 2220f13d8227bf769aec3a699b34b1025f976c8e (diff) | |
| parent | 870a0c669e536d56c6325d84f65e34c53792398e (diff) | |
| download | ffmpeg-4b7c81c3e059ae08e4aa74222de1762342ef8abf.tar.gz | |
Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'
* commit '870a0c669e536d56c6325d84f65e34c53792398e':
build: The libopencore-amrnb encoder depends on audio_frame_queue
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/r210dec.c')
0 files changed, 0 insertions, 0 deletions