Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: source/patched-ffmpeg-mt/libavformat/gxfenc.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/flvenc.c ('k') | source/patched-ffmpeg-mt/libavformat/h261dec.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/gxfenc.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/gxfenc.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/gxfenc.c (working copy)
@@ -678,12 +678,16 @@
sc->sample_rate = 60;
gxf->flags |= 0x00000080;
gxf->time_base = (AVRational){ 1001, 60000 };
- } else { /* assume PAL */
+ } else if (st->codec->height == 576 || st->codec->height == 608) { /* PAL or PAL+VBI */
sc->frame_rate_index = 6;
sc->media_type++;
sc->sample_rate = 50;
gxf->flags |= 0x00000040;
gxf->time_base = (AVRational){ 1, 50 };
+ } else {
+ av_log(s, AV_LOG_ERROR, "unsupported video resolution, "
+ "gxf muxer only accepts PAL or NTSC resolutions currently\n");
+ return -1;
}
av_set_pts_info(st, 64, gxf->time_base.num, gxf->time_base.den);
if (gxf_find_lines_index(st) < 0)
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/flvenc.c ('k') | source/patched-ffmpeg-mt/libavformat/h261dec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698