diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 21:46:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 21:46:35 +0200 |
| commit | 5864ce13d188260998bbf49a2a774fa9bd445c10 (patch) | |
| tree | 149cc5b73142b5a876068d33ec1c127c65e6f37f /libavcodec | |
| parent | 8c51ea54897c2d8671b38efecc1422ad4ad344f9 (diff) | |
| parent | 50d1f4437be88a4b7e412e90d71153cae68017cc (diff) | |
| download | ffmpeg-5864ce13d188260998bbf49a2a774fa9bd445c10.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp3dec: read Xing frame TOC index
mp3dec: use named constants for Xing header flags
libx264: add support for nal-hrd, required for Blu-ray streams.
mov: support random access point grouping
matroskadec: properly support BlockDuration
Conflicts:
libavcodec/libx264.c
libavformat/isom.h
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 39a7d7db8e..d23ced1c0d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -72,6 +72,7 @@ typedef struct X264Context { int direct_pred; int slice_max_size; char *stats; + int nal_hrd } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -481,6 +482,10 @@ static av_cold int X264_init(AVCodecContext *avctx) default: break; } + + if (x4->nal_hrd >= 0) + x4->params.i_nal_hrd = x4->nal_hrd; + if (x4->profile) if (x264_param_apply_profile(&x4->params, x4->profile) < 0) { int i; @@ -643,6 +648,11 @@ static const AVOption options[] = { { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_DIRECT_PRED_AUTO }, 0, 0, VE, "direct-pred" }, { "slice-max-size","Limit the size of each slice in bytes", OFFSET(slice_max_size),AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, { "stats", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, + { "nal-hrd", "Signal HRD information (requires vbv-bufsize; " + "cbr not allowed in .mp4)", OFFSET(nal_hrd), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE, "nal-hrd" }, + { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_NONE}, INT_MIN, INT_MAX, VE, "nal-hrd" }, + { "vbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_VBR}, INT_MIN, INT_MAX, VE, "nal-hrd" }, + { "cbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_CBR}, INT_MIN, INT_MAX, VE, "nal-hrd" }, { NULL }, }; |