repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
eamad.c
diff --git
a/ffmpeg/libavcodec/eamad.c
b/ffmpeg/libavcodec/eamad.c
index 711363ca29130f9f883e1144d0d01d3a0e234e37..813a2d1cdbbaec1e174af26452c88b99292b86c8 100644
(file)
--- a/
ffmpeg/libavcodec/eamad.c
+++ b/
ffmpeg/libavcodec/eamad.c
@@
-257,7
+257,7
@@
static int decode_frame(AVCodecContext *avctx,
inter = (chunk_type == MADm_TAG || chunk_type == MADe_TAG);
bytestream2_skip(&gb, 10);
inter = (chunk_type == MADm_TAG || chunk_type == MADe_TAG);
bytestream2_skip(&gb, 10);
- av_reduce(&avctx->
time_base.num, &avctx->time_base.den
,
+ av_reduce(&avctx->
framerate.den, &avctx->framerate.num
,
bytestream2_get_le16(&gb), 1000, 1<<30);
width = bytestream2_get_le16(&gb);
bytestream2_get_le16(&gb), 1000, 1<<30);
width = bytestream2_get_le16(&gb);
@@
-329,7
+329,7
@@
static av_cold int decode_end(AVCodecContext *avctx)
{
MadContext *t = avctx->priv_data;
av_frame_free(&t->last_frame);
{
MadContext *t = avctx->priv_data;
av_frame_free(&t->last_frame);
- av_free
(
t->bitstream_buf);
+ av_free
p(&
t->bitstream_buf);
return 0;
}
return 0;
}