diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:32:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:32:33 +0200 |
| commit | 8299ed261a950a7b114f07b37ba45bf0b539345b (patch) | |
| tree | b7b45414b7f9adc128bc6669f071e802f1930a9d /libavcodec/h264_ps.c | |
| parent | 16466d92b9f795579d4020b1c7cb3ad7750cc182 (diff) | |
| parent | 8fed466b0a7d636ae5035f9c6074fba9a621539b (diff) | |
| download | ffmpeg-8299ed261a950a7b114f07b37ba45bf0b539345b.tar.gz | |
Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'
* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b':
h264_ps: Drop commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 03f8408f60..7e41042729 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -32,9 +32,6 @@ #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan) #include "golomb.h" - -#include <assert.h> - #define MAX_LOG2_MAX_FRAME_NUM (12 + 4) #define MIN_LOG2_MAX_FRAME_NUM 4 @@ -193,7 +190,6 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){ sps->sar.num= sps->sar.den= 0; } -// s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height); if(get_bits1(&h->gb)){ /* overscan_info_present_flag */ get_bits1(&h->gb); /* overscan_appropriate_flag */ |