diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:34:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:34:07 +0200 |
| commit | 5f312139dff4072c3482a0b01daafcc1446d70c8 (patch) | |
| tree | 8209d82a04b408e2d7a77a6588239b87948a2bec /libavfilter/avcodec.c | |
| parent | 03853b1091e4a60c772677aa885e3d7e0ff19a12 (diff) | |
| parent | 45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c (diff) | |
| download | ffmpeg-5f312139dff4072c3482a0b01daafcc1446d70c8.tar.gz | |
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
qdm2: Whitespace cosmetics
flac: use meaningful return values
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avcodec.c')
0 files changed, 0 insertions, 0 deletions