On Mon, Feb 25, 2013 at 04:48:57PM +0200, Martin Storsjö wrote: > On Mon, 25 Feb 2013, Diego Biurrun wrote: > > >Conflicts: > > > > libavcodec/Makefile > >--- > > > >Still only for the 0.8 branch, but now with the relevant commit > >cherry-picked instead of redone. > > > >--- a/libavcodec/Makefile > >+++ b/libavcodec/Makefile > >@@ -533,7 +533,8 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o > >adpcm_data.o > ># libavformat dependencies > >OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o > >OBJS-$(CONFIG_ADX_DEMUXER) += adx.o > >-OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o > >+OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o \ > >+ ac3tab.o > >OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o > >OBJS-$(CONFIG_DV_MUXER) += dvdata.o > >OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o flacdata.o flac.o > > Still ok, but I don't see the value of the conflict line in the body > as long as there's no reference to which commit it was cherry-picked > from (it doesn't add much value on its own). So remove that from the > commit message, ok with that change.
Yeah, I forgot the '-x' in the cherry-pick command line... Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
