Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents fa42949 + a17e541 commit 2e00d86e7b2cb4fd001d7798ff576447ee02b90d @opdenkamp committed Nov 20, 2011
@@ -1464,7 +1464,7 @@ static void implicit_weight_table(H264Context *h, int field){
*/
static void idr(H264Context *h){
ff_h264_remove_all_refs(h);
- h->prev_frame_num= 0;
+ h->prev_frame_num= -1;
h->prev_frame_num_offset= 0;
h->prev_poc_msb=
h->prev_poc_lsb= 0;
@@ -1892,7 +1892,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
h->mb_field_decoding_flag= s->picture_structure != PICT_FRAME;
if(h0->current_slice == 0){
- while(h->frame_num != h->prev_frame_num &&
+ while(h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0 &&
h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){
Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num);
View
@@ -417,10 +417,15 @@
<select>KEY_ENTER</select>
<start>KEY_SELECT</start>
<back>KEY_EXIT</back>
+ <back>KEY_BACK</back>
+ <back>KEY_CLOSE</back>
<record>KEY_RECORD</record>
<play>KEY_PLAY</play>
+ <play>KEY_PLAYPAUSE</play>
<pause>KEY_PAUSE</pause>
+ <pause>KEY_PLAYPAUSE</pause>
<stop>KEY_STOP</stop>
+ <stop>KEY_STOPCD</stop>
<forward>KEY_FASTFORWARD</forward>
<reverse>KEY_REWIND</reverse>
<volumeplus>KEY_VOLUMEUP</volumeplus>
@@ -431,6 +436,7 @@
<skipminus>KEY_PREVIOUSSONG</skipminus>
<title>KEY_TEXT</title>
<subtitle>KEY_SUBTITLE</subtitle>
+ <language>KEY_LANGUAGE</language>
<mute>KEY_MUTE</mute>
<power>KEY_POWER</power>
<myvideo>KEY_VIDEO</myvideo>
@@ -451,5 +457,10 @@
<green>KEY_GREEN</green>
<yellow>KEY_YELLOW</yellow>
<blue>KEY_BLUE</blue>
+ <menu>KEY_MENU</menu>
+ <info>KEY_PROPS</info>
+ <start>KEY_HOME</start>
+ <display>KEY_ANGLE</display>
+ <teletext>KEY_TEXT</teletext>
</remote>
</lircmap>
Oops, something went wrong.

0 comments on commit 2e00d86

Please sign in to comment.