aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/parseutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-14 15:18:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-14 15:18:56 +0100
commit5b7f7f3809a826e9f1a9a5b6fe6875530044a992 (patch)
treed069e1bc057e4aa0cbb2b702d0d54253d1b1fe73 /libavutil/parseutils.c
parentb07c791252707c88f610daa668eae3ddc6fbccc7 (diff)
parenta4c9260e6914aa82274d1582e1e4ce94ce5194ed (diff)
downloadffmpeg-5b7f7f3809a826e9f1a9a5b6fe6875530044a992.tar.gz
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8: pthread: set the frame properties from the thread context, not user. mp3: exit on parsing error in mp_decode_frame indeo3: initialise pixel planes on allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions