+ }
+}
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+int picture_Export( vlc_object_t *p_obj,
+ block_t **pp_image,
+ video_format_t *p_fmt,
+ picture_t *p_picture,
+ vlc_fourcc_t i_format,
+ int i_override_width, int i_override_height )
+{
+ /* */
+ video_format_t fmt_in = p_picture->format;
+ if( fmt_in.i_sar_num <= 0 || fmt_in.i_sar_den <= 0 )
+ {
+ fmt_in.i_sar_num =
+ fmt_in.i_sar_den = 1;
+ }
+
+ /* */
+ video_format_t fmt_out;
+ memset( &fmt_out, 0, sizeof(fmt_out) );
+ fmt_out.i_sar_num =
+ fmt_out.i_sar_den = 1;
+ fmt_out.i_chroma = i_format;
+
+ /* compute original width/height */
+ unsigned int i_original_width;
+ unsigned int i_original_height;
+ if( fmt_in.i_sar_num >= fmt_in.i_sar_den )
+ {
+ i_original_width = fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den;
+ i_original_height = fmt_in.i_height;
+ }
+ else
+ {
+ i_original_width = fmt_in.i_width;
+ i_original_height = fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num;
+ }
+
+ /* */
+ fmt_out.i_width = ( i_override_width < 0 ) ?
+ i_original_width : i_override_width;
+ fmt_out.i_height = ( i_override_height < 0 ) ?
+ i_original_height : i_override_height;
+
+ /* scale if only one direction is provided */
+ if( fmt_out.i_height == 0 && fmt_out.i_width > 0 )
+ {
+ fmt_out.i_height = fmt_in.i_height * fmt_out.i_width
+ * fmt_in.i_sar_den / fmt_in.i_width / fmt_in.i_sar_num;
+ }
+ else if( fmt_out.i_width == 0 && fmt_out.i_height > 0 )
+ {
+ fmt_out.i_width = fmt_in.i_width * fmt_out.i_height
+ * fmt_in.i_sar_num / fmt_in.i_height / fmt_in.i_sar_den;
+ }
+
+ image_handler_t *p_image = image_HandlerCreate( p_obj );
+
+ block_t *p_block = image_Write( p_image, p_picture, &fmt_in, &fmt_out );
+
+ image_HandlerDelete( p_image );
+
+ if( !p_block )
+ return VLC_EGENERIC;
+
+ p_block->i_pts =
+ p_block->i_dts = p_picture->date;
+
+ if( p_fmt )
+ *p_fmt = fmt_out;
+ *pp_image = p_block;
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+struct picture_fifo_t
+{
+ vlc_mutex_t lock;
+ picture_t *p_first;
+ picture_t **pp_last;
+};
+
+static void PictureFifoReset( picture_fifo_t *p_fifo )
+{
+ p_fifo->p_first = NULL;
+ p_fifo->pp_last = &p_fifo->p_first;
+}
+static void PictureFifoPush( picture_fifo_t *p_fifo, picture_t *p_picture )
+{
+ assert( !p_picture->p_next );
+ *p_fifo->pp_last = p_picture;
+ p_fifo->pp_last = &p_picture->p_next;
+}
+static picture_t *PictureFifoPop( picture_fifo_t *p_fifo )
+{
+ picture_t *p_picture = p_fifo->p_first;
+
+ if( p_picture )
+ {
+ p_fifo->p_first = p_picture->p_next;
+ if( !p_fifo->p_first )
+ p_fifo->pp_last = &p_fifo->p_first;
+ }
+ return p_picture;
+}
+
+picture_fifo_t *picture_fifo_New(void)
+{
+ picture_fifo_t *p_fifo = malloc( sizeof(*p_fifo) );
+ if( !p_fifo )
+ return NULL;
+
+ vlc_mutex_init( &p_fifo->lock );
+ PictureFifoReset( p_fifo );
+ return p_fifo;
+}
+
+void picture_fifo_Push( picture_fifo_t *p_fifo, picture_t *p_picture )
+{
+ vlc_mutex_lock( &p_fifo->lock );
+ PictureFifoPush( p_fifo, p_picture );
+ vlc_mutex_unlock( &p_fifo->lock );
+}
+picture_t *picture_fifo_Pop( picture_fifo_t *p_fifo )
+{
+ vlc_mutex_lock( &p_fifo->lock );
+ picture_t *p_picture = PictureFifoPop( p_fifo );
+ vlc_mutex_unlock( &p_fifo->lock );
+
+ return p_picture;
+}
+picture_t *picture_fifo_Peek( picture_fifo_t *p_fifo )
+{
+ vlc_mutex_lock( &p_fifo->lock );
+ picture_t *p_picture = p_fifo->p_first;
+ if( p_picture )
+ picture_Hold( p_picture );
+ vlc_mutex_unlock( &p_fifo->lock );
+
+ return p_picture;
+}
+void picture_fifo_Flush( picture_fifo_t *p_fifo, mtime_t i_date, bool b_below )
+{
+ picture_t *p_picture;
+
+ vlc_mutex_lock( &p_fifo->lock );
+
+ p_picture = p_fifo->p_first;
+ PictureFifoReset( p_fifo );
+
+ picture_fifo_t tmp;
+ PictureFifoReset( &tmp );
+
+ while( p_picture )
+ {
+ picture_t *p_next = p_picture->p_next;
+
+ p_picture->p_next = NULL;
+ if( ( b_below && p_picture->date <= i_date ) ||
+ ( !b_below && p_picture->date >= i_date ) )
+ PictureFifoPush( &tmp, p_picture );