| 1 | Index: libs/libavcodec/mpeg12.c
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- libs/libavcodec/mpeg12.c (revision 12709)
|
|---|
| 4 | +++ libs/libavcodec/mpeg12.c (working copy)
|
|---|
| 5 | @@ -3311,10 +3311,19 @@
|
|---|
| 6 | if(mpeg_field_start(s2) < 0)
|
|---|
| 7 | return -1;
|
|---|
| 8 | }
|
|---|
| 9 | +
|
|---|
| 10 | + /*
|
|---|
| 11 | + * backout fix introduced in rev.7538
|
|---|
| 12 | + *
|
|---|
| 13 | + * http://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec/mpeg12.c?r1=7538&view=log
|
|---|
| 14 | + *
|
|---|
| 15 | + * (stops FF working in mythtv)
|
|---|
| 16 | + *
|
|---|
| 17 | if(!s2->current_picture_ptr){
|
|---|
| 18 | av_log(avctx, AV_LOG_ERROR, "current_picture not initalized\n");
|
|---|
| 19 | return -1;
|
|---|
| 20 | }
|
|---|
| 21 | + */
|
|---|
| 22 |
|
|---|
| 23 | if(avctx->thread_count > 1){
|
|---|
| 24 | int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
|
|---|
