diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 10:30:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 10:35:51 +0200 |
| commit | bd71071066602a9aa542286829f33eddc9bec615 (patch) | |
| tree | 33f0086902fd986e1152518bf38c700f0ca5a9b7 /libavcodec/sipr.c | |
| parent | 2c1a215ddb8bfa07f33b28ac6e7c587fac6448c2 (diff) | |
| parent | c59967fa7cc5bc2fa06b36c17d2c207240c06b3e (diff) | |
| download | ffmpeg-streaming-bd71071066602a9aa542286829f33eddc9bec615.zip ffmpeg-streaming-bd71071066602a9aa542286829f33eddc9bec615.tar.gz | |
Merge commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e'
* commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e':
h261: check the mtype index
Conflicts:
libavcodec/h261dec.c
The right half of the check is impossible to be true and thus replaced by
an assert()
See: ec3cd74f2dab8e3e8234ccb994132b23d3098585
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions
