diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:18:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:19:26 +0100 |
| commit | a51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6 (patch) | |
| tree | 29569c477d611545385d5d323a9fc02f92617b76 /libavformat/network.c | |
| parent | 042eba52a5ff4939b8c548a9fb5e209790c17b37 (diff) | |
| parent | 56dc46a1893251e74be1ad63e54fb38d754bb1fe (diff) | |
| download | ffmpeg-a51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6.tar.gz | |
Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'
* commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe':
riffenc: do not fall back on AVCodecContext.frame_size for MP3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.c')
0 files changed, 0 insertions, 0 deletions