diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:08:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:11:13 +0100 |
| commit | 13278b97aeb215a7f5ff75bf41485c2c5ebaf5d4 (patch) | |
| tree | d680df20500bda69d72beee8a35d2b7dc8a8f260 /libavcodec/g722dec.c | |
| parent | 8a9878b4ff233abf59924355e5121cb03bbfb7cd (diff) | |
| parent | baeb59d89beda499688e528c6a269d2b255b66f2 (diff) | |
| download | ffmpeg-13278b97aeb215a7f5ff75bf41485c2c5ebaf5d4.tar.gz | |
Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'
* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
avconv: rewrite output data size tracking
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions