diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 16:32:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 16:32:46 +0100 |
commit | 828ac6d1b515ce421519a641b23b05127acc06cd (patch) | |
tree | ed53e59eae42529a062c7d23558f6bbde7d7fcfb /libswresample | |
parent | 1acd029f40de1a0d3ca292cbbe06ea5a173a84ae (diff) | |
parent | ac7b4bfdeb6af11348f15d4a308fcbe61e68b58b (diff) | |
download | ffmpeg-828ac6d1b515ce421519a641b23b05127acc06cd.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: do not wait for the picture allocation to finish on exit
ffplay: remove two unneeded av_free_packet calls
ffplay: remove some unneded av_frame_unref calls
ffplay: remove unneeded avcodec_get_frame_defaults
ffplay: use precalculated frame size and bytes per sec values
ffplay: precalculate audio output frame size and byte per sec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions