OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c29a5d
)
Change max_framesize for small final frame.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 31 Jul 2010 20:52:33 +0000
(20:52 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 31 Jul 2010 20:52:33 +0000
(20:52 +0000)
Originally committed as revision 24631 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/flacenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/flacenc.c
b/libavcodec/flacenc.c
index
dc620b1
..
9cd65e9
100644
(file)
--- a/
libavcodec/flacenc.c
+++ b/
libavcodec/flacenc.c
@@
-1272,6
+1272,12
@@
static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
return 0;
}
+ /* change max_framesize for small final frame */
+ if (avctx->frame_size < s->frame.blocksize) {
+ s->max_framesize = ff_flac_get_max_frame_size(avctx->frame_size,
+ s->channels, 16);
+ }
+
init_frame(s);
copy_samples(s, samples);