diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:49:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:49:13 +0100 |
| commit | db29a7c7c2822a2f2e9804988e279a9fe7d88c11 (patch) | |
| tree | 04fb612effd1e808baf292466197027e8b68b924 /doc/viterbi.txt | |
| parent | 8119d8b01f8391f11c447802782e9017ad419d99 (diff) | |
| parent | 9d46eaec7a90bd8f5cd9e45398c6d17804182320 (diff) | |
| download | ffmpeg-db29a7c7c2822a2f2e9804988e279a9fe7d88c11.tar.gz | |
Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'
* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
build: The FLAC encoder also depends on the flacdsp code
img2: K&R formatting cosmetics
h264: check context state before decoding slice data partitions
flashsv: make sure data for zlib priming is available
Conflicts:
libavcodec/Makefile
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/viterbi.txt')
0 files changed, 0 insertions, 0 deletions