diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:45:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:45:05 +0100 |
| commit | 92b238715929a26d77e99a18fe5996bcb5796149 (patch) | |
| tree | ea683bd86b4609f3aa5386980cb5c5f24d426799 /libavcodec/xsubdec.c | |
| parent | f9d5bdd0f6526e852ec37528c9b5f97beb71ef07 (diff) | |
| parent | df9036830b15997a3e9c3f2c632ed98d64f9deef (diff) | |
| download | ffmpeg-92b238715929a26d77e99a18fe5996bcb5796149.tar.gz | |
Merge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'
* commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef':
truemotion2: return meaningful error codes.
tscc: remove some pointless comments and empty lines.
tscc: return meaningful error codes.
loco: cosmetics, reformat
Conflicts:
libavcodec/truemotion2.c
libavcodec/tscc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xsubdec.c')
0 files changed, 0 insertions, 0 deletions