diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 22:18:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 22:18:43 +0200 |
| commit | 097efa475056e38dba8a194ff841a6ab4f1f847b (patch) | |
| tree | 55dd61291e7d663c60bf677e93876fa831747173 /libavcodec | |
| parent | aa000ddab2352b82b9ef7ec0974080065b7cc409 (diff) | |
| parent | a939e5b2527d0c4628815b1d3d8e29ee921227e8 (diff) | |
Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'
* commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8':
h264: remove a commented out nonsense line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index dd2f89a6c0..95ceca639f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -659,7 +659,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) return ret; /* set defaults */ - // s->decode_mb = ff_h263_decode_mb; if (!avctx->has_b_frames) h->low_delay = 1; |