generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'

Browse Source 
* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
  oggparsetheora: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 13:15:13 +01:00
commit 51c5768cca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/oggparsetheora.c
View File

@ -58,7 +58,6 @@ static int theora_header(AVFormatContext *s, int idx)
switch (os->buf[os->pstart]) {
case 0x80: {
GetBitContext gb;
int width, height;
AVRational timebase;
init_get_bits(&gb, os->buf + os->pstart, os->psize * 8);
@ -73,19 +72,20 @@ static int theora_header(AVFormatContext *s, int idx)
return AVERROR(ENOSYS);
}
width = get_bits(&gb, 16) << 4;
height = get_bits(&gb, 16) << 4;
avcodec_set_dimensions(st->codec, width, height);
st->codec->width = get_bits(&gb, 16) << 4;
st->codec->height = get_bits(&gb, 16) << 4;
if (thp->version >= 0x030400)
skip_bits(&gb, 100);
if (thp->version >= 0x030200) {
width = get_bits_long(&gb, 24);
height = get_bits_long(&gb, 24);
int width = get_bits_long(&gb, 24);
int height = get_bits_long(&gb, 24);
if (width <= st->codec->width && width > st->codec->width - 16 &&
height <= st->codec->height && height > st->codec->height - 16)
avcodec_set_dimensions(st->codec, width, height);
height <= st->codec->height && height > st->codec->height - 16) {
st->codec->width = width;
st->codec->height = height;
}
skip_bits(&gb, 16);
}