diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:09:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:09:56 +0200 |
| commit | 94632dbb1e034f5f9870718f1320ff086889f77c (patch) | |
| tree | 10a08d9386548618510e5a3fc349f5cc0d844814 /libavcodec/g723_1.c | |
| parent | 2138bc16fd0877b522b9e91941897e406642002c (diff) | |
| parent | 143a5390bfc23675529cffcf6186f8cb2e098341 (diff) | |
| download | ffmpeg-94632dbb1e034f5f9870718f1320ff086889f77c.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix return value of get_video_frame if avcodec_decode_video fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
0 files changed, 0 insertions, 0 deletions