diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:18:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:20:29 +0100 |
| commit | 2e57d4ba24b1c7806375ef05a56c3627a97d21db (patch) | |
| tree | ea8d31d8f67a5d266cf38436585d9cb5ce8543ca /libavformat/sierravmd.c | |
| parent | 7c72398787316c82cc13d21fe318ec2fb8b991da (diff) | |
| parent | 2ed8a550da524434deb3b89f7ec62ed833bedac5 (diff) | |
| download | ffmpeg-2e57d4ba24b1c7806375ef05a56c3627a97d21db.tar.gz | |
Merge commit '2ed8a550da524434deb3b89f7ec62ed833bedac5' into release/0.10
* commit '2ed8a550da524434deb3b89f7ec62ed833bedac5':
aac: Check init_get_bits return value
aac: return meaningful errors
dsicinav: K&R formatting cosmetics
Conflicts:
libavcodec/dsicinav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sierravmd.c')
0 files changed, 0 insertions, 0 deletions