diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 04:09:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 04:13:28 +0200 |
| commit | 7b9e98173ca7afea8dd76191f63ab6995ba01777 (patch) | |
| tree | 74993c45afd648f0792b1287cae92a4d4a9b72a8 /libavformat | |
| parent | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (diff) | |
| download | ffmpeg-7b9e98173ca7afea8dd76191f63ab6995ba01777.tar.gz | |
Revert "Eliminate pointless '#if 1' statements without matching '#else'."
no comment
This reverts commit e6ff064845d02c43526c8a56dab121c219f16659.
Conflicts:
libavcodec/dsputil.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nutenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 272072283b..47eaa2c81c 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -175,6 +175,7 @@ static void build_frame_code(AVFormatContext *s){ } key_frame= intra_only; +#if 1 if(is_audio){ int frame_bytes= codec->frame_size*(int64_t)codec->bit_rate / (8*codec->sample_rate); int pts; @@ -198,6 +199,7 @@ static void build_frame_code(AVFormatContext *s){ ft->pts_delta=1; start2++; } +#endif if(codec->has_b_frames){ pred_count=5; |